auto merge of #589 : alexcrichton/cargo/fix-win64, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 17 Sep 2014 20:15:50 +0000 (20:15 +0000)
committerbors <bors@rust-lang.org>
Wed, 17 Sep 2014 20:15:50 +0000 (20:15 +0000)
See comments in the makefile


Trivial merge